merge with xen-unstable.hg
authorawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Thu, 5 Oct 2006 18:25:53 +0000 (12:25 -0600)
committerawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Thu, 5 Oct 2006 18:25:53 +0000 (12:25 -0600)

Trivial merge